From: Diederik de Haas <didi.debian@cknow.org>
Date: Tue, 18 Jun 2024 07:46:18 +0000 (+0200)
Subject: [PATCH] tools/rtla: Restore option to set VERSION var to VERSION file's contents
X-Git-Tag: archive/raspbian/6.12.27-1+rpi1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~54
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c37eb4bb77c85a2d40718d778aea57db2ee30e63;p=linux.git

[PATCH] tools/rtla: Restore option to set VERSION var to VERSION file's contents

From 6640548d40a85053cf065f4c66f298bb5253557f Mon Sep 17 00:00:00 2001
Forwarded: not-needed

In upstream commit 01474dc706ca ("tools/rtla: Use tools/build makefiles
to build rtla") the ``Makefile`` was completely restructered to make
use of the ``tools/build`` infrastructure.

For some reason, the restructuring also caused the ``cat VERSION`` part
to detect the kernel version to be dropped and only runs the
``kernelversion`` (toplevel) Makefile target.
Previously that was used as fallback when ``VERSION`` didn't exist.
Re-add the ``cat VERSION`` part as that is used in the Debian build
system.

Gbp-Pq: Topic debian
Gbp-Pq: Name tools-rtla-Restore-option-to-set-VERSION-var-to-VERS.patch
---

diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile
index b5878be3612..fec9e0a1086 100644
--- a/tools/tracing/rtla/Makefile
+++ b/tools/tracing/rtla/Makefile
@@ -27,7 +27,7 @@ endif
 RTLA		:= $(OUTPUT)rtla
 RTLA_IN		:= $(RTLA)-in.o
 
-VERSION		:= $(shell sh -c "make -sC ../../.. kernelversion | grep -v make")
+VERSION		:= $(shell cat VERSION 2> /dev/null || sh -c "make -sC ../../.. kernelversion | grep -v make")
 DOCSRC		:= ../../../Documentation/tools/rtla/
 
 FEATURE_TESTS	:= libtraceevent